add demo of passing non-stock label in to gtk_dialog_new_with_buttons

2001-09-26  Havoc Pennington  <hp@redhat.com>

	* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
	of passing non-stock label in to gtk_dialog_new_with_buttons

	* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
	debugging updates

	* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
	are private

	* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
	exist, fall back to mnemonic label, not plain label, bug #61184

diff --git a/ChangeLog b/ChangeLog
index b25e7a5f495c37ad9d87828bbb90a11cca5b4249..c20a1a53ecc5dd3ab802206d76fa5122e062de86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-26  Havoc Pennington  <hp@redhat.com>
+
+       * demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
+       of passing non-stock label in to gtk_dialog_new_with_buttons
+
+       * gtk/gtktextview.c (cursor_blinks): disable cursor blink when
+       debugging updates
+
+       * gtk/gtktextiter.h: comment about how GtkTextIter struct contents
+       are private
+
+       * gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
+       exist, fall back to mnemonic label, not plain label, bug #61184
+       
 Wed Sep 26 19:48:01 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b25e7a5f495c37ad9d87828bbb90a11cca5b4249..c20a1a53ecc5dd3ab802206d76fa5122e062de86 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+2001-09-26  Havoc Pennington  <hp@redhat.com>
+
+       * demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
+       of passing non-stock label in to gtk_dialog_new_with_buttons
+
+       * gtk/gtktextview.c (cursor_blinks): disable cursor blink when
+       debugging updates
+
+       * gtk/gtktextiter.h: comment about how GtkTextIter struct contents
+       are private
+
+       * gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
+       exist, fall back to mnemonic label, not plain label, bug #61184
+       
 Wed Sep 26 19:48:01 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b25e7a5f495c37ad9d87828bbb90a11cca5b4249..c20a1a53ecc5dd3ab802206d76fa5122e062de86 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+2001-09-26  Havoc Pennington  <hp@redhat.com>
+
+       * demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
+       of passing non-stock label in to gtk_dialog_new_with_buttons
+
+       * gtk/gtktextview.c (cursor_blinks): disable cursor blink when
+       debugging updates
+
+       * gtk/gtktextiter.h: comment about how GtkTextIter struct contents
+       are private
+
+       * gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
+       exist, fall back to mnemonic label, not plain label, bug #61184
+       
 Wed Sep 26 19:48:01 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b25e7a5f495c37ad9d87828bbb90a11cca5b4249..c20a1a53ecc5dd3ab802206d76fa5122e062de86 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+2001-09-26  Havoc Pennington  <hp@redhat.com>
+
+       * demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
+       of passing non-stock label in to gtk_dialog_new_with_buttons
+
+       * gtk/gtktextview.c (cursor_blinks): disable cursor blink when
+       debugging updates
+
+       * gtk/gtktextiter.h: comment about how GtkTextIter struct contents
+       are private
+
+       * gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
+       exist, fall back to mnemonic label, not plain label, bug #61184
+       
 Wed Sep 26 19:48:01 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b25e7a5f495c37ad9d87828bbb90a11cca5b4249..c20a1a53ecc5dd3ab802206d76fa5122e062de86 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+2001-09-26  Havoc Pennington  <hp@redhat.com>
+
+       * demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
+       of passing non-stock label in to gtk_dialog_new_with_buttons
+
+       * gtk/gtktextview.c (cursor_blinks): disable cursor blink when
+       debugging updates
+
+       * gtk/gtktextiter.h: comment about how GtkTextIter struct contents
+       are private
+
+       * gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
+       exist, fall back to mnemonic label, not plain label, bug #61184
+       
 Wed Sep 26 19:48:01 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b25e7a5f495c37ad9d87828bbb90a11cca5b4249..c20a1a53ecc5dd3ab802206d76fa5122e062de86 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+2001-09-26  Havoc Pennington  <hp@redhat.com>
+
+       * demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
+       of passing non-stock label in to gtk_dialog_new_with_buttons
+
+       * gtk/gtktextview.c (cursor_blinks): disable cursor blink when
+       debugging updates
+
+       * gtk/gtktextiter.h: comment about how GtkTextIter struct contents
+       are private
+
+       * gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
+       exist, fall back to mnemonic label, not plain label, bug #61184
+       
 Wed Sep 26 19:48:01 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b25e7a5f495c37ad9d87828bbb90a11cca5b4249..c20a1a53ecc5dd3ab802206d76fa5122e062de86 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+2001-09-26  Havoc Pennington  <hp@redhat.com>
+
+       * demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
+       of passing non-stock label in to gtk_dialog_new_with_buttons
+
+       * gtk/gtktextview.c (cursor_blinks): disable cursor blink when
+       debugging updates
+
+       * gtk/gtktextiter.h: comment about how GtkTextIter struct contents
+       are private
+
+       * gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
+       exist, fall back to mnemonic label, not plain label, bug #61184
+       
 Wed Sep 26 19:48:01 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index 92358b973ac24c4907c6201436741f238f6afff0..5bca888f0b29a12ee26d0be4c7b7d53010bcd8f9 100644 (file)
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -46,6 +46,8 @@ interactive_dialog_clicked (GtkButton *button,
                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
                                        GTK_STOCK_OK,
                                        GTK_RESPONSE_OK,
+                                        "_Non-stock Button",
+                                        GTK_RESPONSE_CANCEL,
                                        NULL);
 
   hbox = gtk_hbox_new (FALSE, 8);

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 5d4a27a7b6a80cf9a57594725e9cc7e305e3c7d9..cc49f886efaa45cb511af7afb2033408ac8a3e2b 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -465,16 +465,24 @@ gtk_button_new_with_label (const gchar *label)
 /**
  * gtk_button_new_from_stock:
  * @stock_id: the name of the stock item 
- * @returns: a new #GtkButton
  *
  * Creates a new #GtkButton containing the image and text from a stock item.
  * Some stock ids have preprocessor macros like #GTK_STOCK_OK and
  * #GTK_STOCK_APPLY.
+ *
+ * If @stock_id is unknown, then it will be treated as a mnemonic
+ * label (as for gtk_button_new_with_mnemonic()).
+ *
+ * Returns: a new #GtkButton
  **/
 GtkWidget*
-gtk_button_new_from_stock (const gchar   *stock_id)
+gtk_button_new_from_stock (const gchar *stock_id)
 {
-  return g_object_new (GTK_TYPE_BUTTON, "label", stock_id, "use_stock", TRUE,  NULL);
+  return g_object_new (GTK_TYPE_BUTTON,
+                       "label", stock_id,
+                       "use_stock", TRUE,
+                       "use_underline", TRUE,
+                       NULL);
 }
 
 /**

diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 72303ea931373522bf41f8064807955be42bf1e7..8d6096ca9cec89f3b3e5ab8274712d5abd97ae3a 100644 (file)
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -43,6 +43,11 @@ extern "C" {
 typedef struct _GtkTextBuffer GtkTextBuffer;
 
 struct _GtkTextIter {
+  /* GtkTextIter is an opaque datatype; ignore all these fields.
+   * Initialize the iter with gtk_text_buffer_get_iter_*
+   * functions
+   */
+  /*< private >*/
   gpointer dummy1;
   gpointer dummy2;
   gint dummy3;

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index ed38d1c9c79088188be42d4e95bbbdab494bf0c0..d3dfd9d7388a6bf740c310de8888cd75cf9d144a 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -3776,6 +3776,8 @@ cursor_blinks (GtkTextView *text_view)
 #ifdef DEBUG_VALIDATION_AND_SCROLLING
   return FALSE;
 #endif
+  if (gtk_debug_flags & GTK_DEBUG_UPDATES)
+    return FALSE;
   
   g_object_get (G_OBJECT (settings), "gtk-cursor-blink", &blink, NULL);
   return blink;